Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attitude field added to blackbox fields list #4248

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Attitude field added to blackbox fields list #4248

merged 2 commits into from
Nov 25, 2024

Conversation

demvlad
Copy link
Contributor

@demvlad demvlad commented Nov 14, 2024

Improvement for "Added flight IMU pitch, roll, yaw attitudes to blackbox log" PR
Added "Attitude" field in blackbox log list
confatt

@netlify Netlify
Copy link

netlify bot commented Nov 14, 2024 •
edited
Loading

✅ Deploy Preview for origin-betaflight-app ready!

Name Link
🔨 Latest commit 28e9635
🔍 Latest deploy log https://app.netlify.com/sites/origin-betaflight-app/deploys/6736359bd635730008bf5284
😎 Deploy Preview https://deploy-preview-4248.dev.app.betaflight.com
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

haslinghuis
haslinghuis requested changes Nov 14, 2024
View reviewed changes
src/js/debug.js Outdated Show resolved Hide resolved
@haslinghuis haslinghuis added this to the 11.0 milestone Nov 14, 2024
@haslinghuis
Copy link
Member

Please rebase

@demvlad demvlad marked this pull request as draft November 14, 2024 16:23
@demvlad
Copy link
Contributor Author

demvlad commented Nov 14, 2024 •
edited
Loading

The work is restored after wrong rebase.
Looked very simmilar during rebase, missed difference...

@demvlad demvlad requested a review from haslinghuis November 14, 2024 16:49
@demvlad demvlad marked this pull request as ready for review November 14, 2024 16:50
@haslinghuis
Copy link
Member

@nerdCopter how would you approach ?

Would suggest using git rebase -i HEAD~60 and pick first commit and drop all others.
And then probably git pull --rebase upstream master

@nerdCopter
Copy link
Member

nerdCopter commented Nov 14, 2024 •
edited
Loading

sometimes i tend to

git checkout myBranch
git fetch --all
git merge upstream/master
git rebase -i upstream/master

this seems to keep my ordered commits, while rebasing upon master.

when i play with this stuff, i tend to make new test-branches try the commands, then either

  • redo it in original branch and force-push, or
  • delete the original branch and rename the test-branch (but this second approach corrupts the PR's)

@demvlad demvlad force-pushed the attitude_bb_log_condition branch from 0d8ef1d to bcda1c7 Compare November 14, 2024 17:14
@demvlad
Copy link
Contributor Author

demvlad commented Nov 14, 2024 •
edited
Loading

The one code row changed only. Rebased master, created and push force new branch

haslinghuis
haslinghuis reviewed Nov 14, 2024
View reviewed changes
src/js/debug.js Outdated
@@ -774,6 +774,7 @@ const DEBUG = {
"Altitude",
"RSSI",
"Gyro",
"Attitude",
Copy link
Member

@haslinghuis haslinghuis Nov 14, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"Attitude",

For backwards compatibility: insert attitude after line 836 (within semver block):

DEBUG.enableFields.splice(DEBUG.enableFields.indexOf("Gyro"), 0, "Attitude");

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've suspected, that this improvement can not be too easy :)

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@demvlad
Copy link
Contributor Author

demvlad commented Nov 14, 2024 •
edited
Loading

The test result of BF, Configurator and explorer work are showed this

@nerdCopter nerdCopter mentioned this pull request Nov 14, 2024
Merged
@haslinghuis haslinghuis merged commit 9ef7a1c into betaflight:master Nov 25, 2024
8 checks passed
@demvlad demvlad deleted the attitude_bb_log_condition branch November 25, 2024 17:43
@demvlad demvlad mentioned this pull request Dec 5, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VitroidFPV VitroidFPV VitroidFPV approved these changes

@haslinghuis haslinghuis haslinghuis approved these changes

@nerdCopter nerdCopter Awaiting requested review from nerdCopter

@McGiverGim McGiverGim Awaiting requested review from McGiverGim

@blckmn blckmn Awaiting requested review from blckmn

@KarateBrot KarateBrot Awaiting requested review from KarateBrot

Assignees

@demvlad demvlad

Labels
Needs coordination with firmware RN: IMPROVEMENT
Projects
Finalizing Firmware 4.6 Release
Status: Done
Milestone
11.0
Development

Successfully merging this pull request may close these issues.
4 participants
@demvlad @haslinghuis @nerdCopter @VitroidFPV